From 50cf1c08ddbf79722a3dd3f9b117b5e05cd602ad Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 6 Jun 2023 22:45:02 -0400 Subject: [PATCH] print: Install headers in a subdir This is a first step towards isolating the printing code within gtk. --- gtk/gtk.h | 12 ++++++------ gtk/gtkpagesetup.c | 4 ++-- gtk/gtkpagesetupunixdialog.c | 2 +- gtk/gtkpapersize.c | 4 ++-- gtk/gtkprintoperation-portal.c | 4 ++-- gtk/gtkprintoperation-portal.h | 2 +- gtk/gtkprintoperation-private.h | 2 +- gtk/gtkprintoperationpreview.c | 2 +- gtk/gtkprintsettings.c | 2 +- gtk/meson.build | 11 ++++------- gtk/{ => print}/gtkpagesetup.h | 2 +- gtk/{ => print}/gtkpapersize.h | 0 gtk/{ => print}/gtkprintcontext.h | 2 +- gtk/{ => print}/gtkprintoperation.h | 8 ++++---- gtk/{ => print}/gtkprintoperationpreview.h | 2 +- gtk/{ => print}/gtkprintsettings.h | 2 +- gtk/print/meson.build | 8 ++++++++ 17 files changed, 37 insertions(+), 32 deletions(-) rename gtk/{ => print}/gtkpagesetup.h (99%) rename gtk/{ => print}/gtkpapersize.h (100%) rename gtk/{ => print}/gtkprintcontext.h (98%) rename gtk/{ => print}/gtkprintoperation.h (98%) rename gtk/{ => print}/gtkprintoperationpreview.h (98%) rename gtk/{ => print}/gtkprintsettings.h (99%) create mode 100644 gtk/print/meson.build diff --git a/gtk/gtk.h b/gtk/gtk.h index 8ad4e38902..c5f9b4b583 100644 --- a/gtk/gtk.h +++ b/gtk/gtk.h @@ -200,19 +200,19 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/gtk/gtkpagesetup.c b/gtk/gtkpagesetup.c index 588e43d8e7..5e77236127 100644 --- a/gtk/gtkpagesetup.c +++ b/gtk/gtkpagesetup.c @@ -18,9 +18,9 @@ #include "config.h" -#include "gtkpagesetup.h" +#include "print/gtkpagesetup.h" #include "gtkprintutilsprivate.h" -#include "gtkprintoperation.h" /* for GtkPrintError */ +#include "print/gtkprintoperation.h" /* for GtkPrintError */ #include #include "gtktypebuiltins.h" diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c index e9f5cfd6ab..c0de95de55 100644 --- a/gtk/gtkpagesetupunixdialog.c +++ b/gtk/gtkpagesetupunixdialog.c @@ -33,7 +33,7 @@ #include "gtkpagesetupunixdialog.h" #include "gtkcustompaperunixdialog.h" #include "gtkprintbackendprivate.h" -#include "gtkpapersize.h" +#include "print/gtkpapersize.h" #include "gtkprintutilsprivate.h" #include "deprecated/gtkdialogprivate.h" diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c index 97bd96d49c..20fa327a64 100644 --- a/gtk/gtkpapersize.c +++ b/gtk/gtkpapersize.c @@ -26,9 +26,9 @@ #endif #include -#include "gtkpapersize.h" +#include "print/gtkpapersize.h" #include "gtkprintutilsprivate.h" -#include "gtkprintoperation.h" /* for GtkPrintError */ +#include "print/gtkprintoperation.h" /* for GtkPrintError */ #include /* _gtk_load_custom_papers() only on Unix so far */ diff --git a/gtk/gtkprintoperation-portal.c b/gtk/gtkprintoperation-portal.c index d39ad1645c..4f4c4ccaae 100644 --- a/gtk/gtkprintoperation-portal.c +++ b/gtk/gtkprintoperation-portal.c @@ -31,8 +31,8 @@ #include "gtkprintoperation-private.h" #include "gtkprintoperation-portal.h" -#include "gtkprintsettings.h" -#include "gtkpagesetup.h" +#include "print/gtkprintsettings.h" +#include "print/gtkpagesetup.h" #include "gtkprintbackendprivate.h" #include "gtkfilelauncher.h" #include diff --git a/gtk/gtkprintoperation-portal.h b/gtk/gtkprintoperation-portal.h index ee84b28f69..6aa1219213 100644 --- a/gtk/gtkprintoperation-portal.h +++ b/gtk/gtkprintoperation-portal.h @@ -17,7 +17,7 @@ #pragma once -#include "gtkprintoperation.h" +#include "print/gtkprintoperation.h" G_BEGIN_DECLS diff --git a/gtk/gtkprintoperation-private.h b/gtk/gtkprintoperation-private.h index 46833a63c5..f5daa45291 100644 --- a/gtk/gtkprintoperation-private.h +++ b/gtk/gtkprintoperation-private.h @@ -18,7 +18,7 @@ #pragma once -#include "gtkprintoperation.h" +#include "print/gtkprintoperation.h" G_BEGIN_DECLS diff --git a/gtk/gtkprintoperationpreview.c b/gtk/gtkprintoperationpreview.c index 423e352390..af4ae58799 100644 --- a/gtk/gtkprintoperationpreview.c +++ b/gtk/gtkprintoperationpreview.c @@ -18,7 +18,7 @@ #include "config.h" -#include "gtkprintoperationpreview.h" +#include "print/gtkprintoperationpreview.h" #include "gtkmarshalers.h" #include "gtkprivate.h" diff --git a/gtk/gtkprintsettings.c b/gtk/gtkprintsettings.c index 5daa6e6711..04a02e350e 100644 --- a/gtk/gtkprintsettings.c +++ b/gtk/gtkprintsettings.c @@ -23,7 +23,7 @@ #include -#include "gtkprintsettings.h" +#include "print/gtkprintsettings.h" #include "gtkprintutilsprivate.h" #include "gtktypebuiltins.h" #include "gtkwidget.h" diff --git a/gtk/meson.build b/gtk/meson.build index 65b13ffd48..824d3c0129 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -545,19 +545,13 @@ gtk_public_headers = files([ 'gtkoverlay.h', 'gtkoverlaylayout.h', 'gtkpadcontroller.h', - 'gtkpagesetup.h', 'gtkpaned.h', - 'gtkpapersize.h', 'gtkpasswordentry.h', 'gtkpasswordentrybuffer.h', 'gtkpicture.h', 'gtkpopover.h', 'gtkpopovermenu.h', 'gtkpopovermenubar.h', - 'gtkprintcontext.h', - 'gtkprintoperation.h', - 'gtkprintoperationpreview.h', - 'gtkprintsettings.h', 'gtkprogressbar.h', 'gtkrange.h', 'gtkrecentmanager.h', @@ -632,8 +626,11 @@ gtk_public_headers = files([ 'gtk.h', ]) +subdir('print') + install_headers(gtk_public_headers, subdir: 'gtk-4.0/gtk/') install_headers(gtk_deprecated_headers, subdir: 'gtk-4.0/gtk/deprecated') +install_headers(gtk_print_headers, subdir: 'gtk-4.0/gtk/print') gtk_sources = gtk_public_sources + gtk_private_sources @@ -958,7 +955,7 @@ gtkmarshalers = gnome.genmarshal('gtkmarshalers', gtkmarshal_h = gtkmarshalers[1] gtktypebuiltins = gnome.mkenums('gtktypebuiltins', - sources: gtk_public_headers + gtk_deprecated_headers, + sources: gtk_public_headers + gtk_deprecated_headers + gtk_print_headers, c_template: 'gtktypebuiltins.c.template', h_template: 'gtktypebuiltins.h.template', install_dir: gtk_includedir / 'gtk-4.0/gtk', diff --git a/gtk/gtkpagesetup.h b/gtk/print/gtkpagesetup.h similarity index 99% rename from gtk/gtkpagesetup.h rename to gtk/print/gtkpagesetup.h index 770db797a8..975e3d75b0 100644 --- a/gtk/gtkpagesetup.h +++ b/gtk/print/gtkpagesetup.h @@ -23,7 +23,7 @@ #error "Only can be included directly." #endif -#include +#include G_BEGIN_DECLS diff --git a/gtk/gtkpapersize.h b/gtk/print/gtkpapersize.h similarity index 100% rename from gtk/gtkpapersize.h rename to gtk/print/gtkpapersize.h diff --git a/gtk/gtkprintcontext.h b/gtk/print/gtkprintcontext.h similarity index 98% rename from gtk/gtkprintcontext.h rename to gtk/print/gtkprintcontext.h index 3c09c366c2..d492959300 100644 --- a/gtk/gtkprintcontext.h +++ b/gtk/print/gtkprintcontext.h @@ -24,7 +24,7 @@ #endif #include -#include +#include G_BEGIN_DECLS diff --git a/gtk/gtkprintoperation.h b/gtk/print/gtkprintoperation.h similarity index 98% rename from gtk/gtkprintoperation.h rename to gtk/print/gtkprintoperation.h index 2b6bb7075a..ccee5d8e16 100644 --- a/gtk/gtkprintoperation.h +++ b/gtk/print/gtkprintoperation.h @@ -26,10 +26,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include G_BEGIN_DECLS diff --git a/gtk/gtkprintoperationpreview.h b/gtk/print/gtkprintoperationpreview.h similarity index 98% rename from gtk/gtkprintoperationpreview.h rename to gtk/print/gtkprintoperationpreview.h index 32ac15c447..b5b952f636 100644 --- a/gtk/gtkprintoperationpreview.h +++ b/gtk/print/gtkprintoperationpreview.h @@ -23,7 +23,7 @@ #endif #include -#include +#include G_BEGIN_DECLS diff --git a/gtk/gtkprintsettings.h b/gtk/print/gtkprintsettings.h similarity index 99% rename from gtk/gtkprintsettings.h rename to gtk/print/gtkprintsettings.h index 507fae60fa..e3e51025f3 100644 --- a/gtk/gtkprintsettings.h +++ b/gtk/print/gtkprintsettings.h @@ -22,7 +22,7 @@ #error "Only can be included directly." #endif -#include +#include G_BEGIN_DECLS diff --git a/gtk/print/meson.build b/gtk/print/meson.build new file mode 100644 index 0000000000..8028cd520a --- /dev/null +++ b/gtk/print/meson.build @@ -0,0 +1,8 @@ +gtk_print_headers = files([ + 'gtkpagesetup.h', + 'gtkpapersize.h', + 'gtkprintcontext.h', + 'gtkprintoperation.h', + 'gtkprintoperationpreview.h', + 'gtkprintsettings.h', +]) -- 2.30.2